Switch to the correct milestone version
Merge branch 'AEROGEAR-782'
Merge branch 'master' of https://github.com/aerogear/aerogear-security-picketbox