(cherry picked from commit d0ba11b3f3d53c03841fc732d2466083f9226881) Signed-off-by: John Blum <jblum@pivotal.io>