Bump version to 3.1rc2
Merge branch 'master' into CFY-1569-allow-explcit-passing-of-neutron-url-in-openstack-credentials