working together w/ Massimiliano Ziccardi on this feature, we need to unify the branch from the two of us.

this is basically:

• cherry picking and rebasing
• sending a final PR to aerogear 1.1.x-dev branch