FLUID-4907: refactoring expandSchemaComponents

Refactored the fluid.uiOptions.expandSchemaComponents function. Tied in the deletion of keys with rearragneDirect. Also adjusted the code to merge instead of override options.