Remove packaging changes from master branch

The plan from now on, for the calico-nova and calico-neutron
repositories, is that the master branch will only contain
Calico-related OpenStack code changes.  There will be separate
branches for Ubuntu and Red Hat packaging, and we will merge the
master branch into those before preparing new package releases.