Package name changes
Merge branch 'master' into nov-profile-prototype
Correct naming of URI server and war packages
Merge branch 'master' into nov-profile-prototype