Make lockorder consistent in channelmanager