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