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