[Issue-16] Changed behaviour when overriding property values

Change-Id: I4aa9dc61f20f58256023e6a42e98b4d4b67938dc
Merge "[Issue-16] Changed behaviour when overriding property values"
[Issue-16] Changed behaviour when overriding property values

* Add preserveExisting parameter to loadExtraFiles
* Fix unit test