Merge branch 'jboss-libra-dev'