Merge "conman:  Add and remove routes in correct order."