RR: making sure the private directory is not committed.

Change-Id: I731688c867310b6ed01ede0027d8a1368678f7e2
Rr: added separation of settings and nagios file for UAT and test to master.

Change-Id: I9375c5c6832d84e4d4128a2787ff7bebe59ad9ee