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