Merge "Resolve Bug:745 - remove windows line endings from config and netconf."