Updated to 6.0.2.CR2 of product.
Merge branch '6.0.2'