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