[#150304050](https://www.pivotaltracker.com/story/show/150304050)
[#149584947](https://www.pivotaltracker.com/story/show/149584947)

Signed-off-by: Chris Dutra <cdutra@pivotal.io>