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