JBIDE-15961 - For JBIDE 4.1.1.CR1: Code Freeze + Branch [Arquillian]