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