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