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