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