Fixed merge issues with RavenFS branch.