Adding services=import to jboss-deployment-structure and several other minor modifications