Merge branch 'users/amaverma/fixUTsInSchemaCore' into 'master'

Fixing the schema resolver related Unit tests

See merge request !162
32 jobs for master in 85 minutes and 10 seconds (queued for 6 seconds)