refactor some map proxy support methods
refactor some tests & add toString() QueryResultSet & edit suppressions.xml
create map predicate test
test refactor
test refactor
resolve merge conflicts
resolve merge conflicts
cleanup
rename methods
Merge pull request #2943 from ahmetmircik/cs/3.3/mapProxySupport

Makes map proxy package more check-style compliant