Merge "Use config.xml parameters instead of System properties." into mnc-dev