Closing, as any changes from this PR will be addressed in https://issues.jboss.org/browse/AEROGEAR-3508