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