additional sc query mapper test
fixing some integration tests
further integration test fixes for automapping
Merge branch 'release/3.0.0.0' into develop