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