OZP-648: Deconflicting cxf servlet URL with our REST bundle's URL
Merge branch 'master' into feature/ozp-648-current-user