Removing line breaks from default configs

Fixes bug #1233192

Change-Id: I14a74199fbbd3ba1acf479886ea01da6931bfeca
Merge "Removing line breaks from default configs"