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