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