Fixed merge issues with RavenFS branch.

Those are the changes in conflict for RavenFS. There are still some outstanding error compiles for ChangesAPI.