Bz1018959: Remove dual branding and references to JBoss AS 7