OZP-64: code review changes: Changing guid references to 'id'
OZP-64: code review fixes: regex escapes, unneeded requires
OZP-64: code review changes: comment fixes
OZP-64: Preferences Service changes
Merge branch 'feature/ozp-64-preferences-api'