SYS-152: Updating default config files
SYS-152: Updating sample config files