Merge "conman:  More debug logging, persist 'wifi setclient' options."