Merged fixes
master: https://github.com/jboss-developer/jboss-eap-quickstarts/commit/d36b3b6493bccde0a5609c2269584a674359311b
6.2.x: https://github.com/jboss-developer/jboss-eap-quickstarts/commit/a889efaabb4a93a6d34b7d9bd19edc0480163258
Merged fixes
master: https://github.com/jboss-developer/jboss-eap-quickstarts/commit/d36b3b6493bccde0a5609c2269584a674359311b
6.2.x: https://github.com/jboss-developer/jboss-eap-quickstarts/commit/a889efaabb4a93a6d34b7d9bd19edc0480163258