More work on Junits for mapEntryQueryServiceTestIT
Merge remote-tracking branch 'origin/master'