Change system.properties to add new paths.
Merge origin/master