RR: removed logging from setting for test.

Change-Id: I0085076d225c863d215e171463303fd51fcdf7bd
RR: rationalising logging in settings files.

Change-Id: I640c20290e73fe285c62b7868e1db73637312e9f