DATACASS-32 : WIP : Removed optionsByName for Query Options override.
DATACASS-32 : Completed : Refactoring completed after code review.
Merge branch 'master' of https://github.com/SciSpike/spring-data-cassandra.git