Update for v6.6.2

Signed-off-by: Tyler Schultz <tschultz@pivotal.io>
Merge branch 'drich10-master'