Bring version in-line with current jboss-as/master