adding in Non-integrated testing for MapEntryQueryService, updating
FakeData system accordingly to allow proper mocking.
Merge remote-tracking branch 'origin/master'
Some updates to MapEntryQueryServiceIT test.  This is just for Kevin to
investigate a strange error.