This was done just partially. I created more focused jira tickets under https://issues.jboss.org/browse/AEROGEAR-3478 epic representing followup tasks mentioned in the description of this ticket that have not been addressed.