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