Bump version to 3.1rc1
Merge branch 'master' into CFY-1372-tosca-naming-convention