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