Reinstate RPM dependency on calico-common to pick up calico-diags.
Reinstate RPM dependency on calico-common to pick up calico-diags.

matthewdupre/felix,neiljerram/felix,matthewdupre/felix,Metaswitch/calico,neiljerram/felix,Metaswitch/calico,neiljerram/felix,neiljerram/felix