Merged with this commit: https://github.com/jboss-developer/jboss-developer-shared-resources/commit/b63a11b874cee5b4c78652201b32a04330528c70