Fixed lockSettings config loading with dynamic config.xml;
Merge remote-tracking branch 'remotes/origin/master'