Merge "conman:  Fix test failure introduced in 8445514."