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