Merge "conman:  Route management changes."