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