Bump version to 3.1rc2
Merge branch 'master' into CFY-1590-nova-net-support-for-3.1