fixups for new contrail repos and packages