Refactor jbosseap611 to use the jboss image and general cleanup.