Merged milestones/m2.1 into master

This does not yet have common/ovs.pp networking setup merged.