Switch to contrail-control as newer packages get uploaded to launchpad