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