Simplify metadata patch and fix associated unit test
Apply existing patches
Merge branch 'calico_2014.1.3' into merge-tmp
Prepare for merging new changes
Merge branch 'merge-tmp' into ubuntu_2014.1.3
Regenerate Calico patch
Unapply patches
Update debian/changelog for 1:2014.1.3-0ubuntu1.2calico0.5.2