keyset cleanups
Merge remote-tracking branch 'origin/master' into features/sonar-cleanup
not designed for extension
fix compareTo to match superclass and handle Service special case
change to string,string
Merge remote-tracking branch 'origin/features/sonar-cleanup'