Bump version to 1.2m1
Merge branch 'master' into CFY-1352-openstack-router-type-improvements