EAGLESIX-2651: Mod: sync w/ 2.6.5 code, fix tests
Merge pull request #77 from RiveraGroup/feature/mongo_2.6.5_expressions_Mod

EAGLESIX-2651: Mod: sync w/ 2.6.5 code, fix tests