Merge "conman:  Read cwmp output from /config, not /tmp."