FLUID-5362: Added OptionsMerging.md

Converted http://wiki.fluidproject.org/display/docs/Options+Merging to markdown