DDF-226: Modified classes to use the new ConfigurationWatcher located in platform.