JBIDE-15949 For JBIDE 4.1.1.CR1: Code Freeze + Branch [VPE]