Revert CLI option fix
XD-739:Refactored Options framework and replaced xd.* external properties with XD_*
removed OptionMetadata
XD-739 - Removed XDPropertyConfigurer. Added logic to partition XD properties into 2 property sources for explicit and default