EAGLESIX-2696 formatting changes and merge goodness
EAGLESIX-2696 All test cases pass.
Merge pull request #36 from RiveraGroup/feature/mongo_2.6.5_expressions_Const

Feature/mongo 2.6.5 expressions const