Merge changes Iebbb335f,If7fd3978

* changes:
  Clear the setttings provider cache before test runs
  Add test mappings to ensure settings backup tests run on appropriate changes.