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