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