Upgrade production and staging to 6.0
Bumping release environment to 6.1.0 RC1
Upgrade release environment to 6.1.0
Bump production and staging environment to 6.1
Bump release environment to 6.1.1
Bump production to 6.1.1
Fix trailing comma in performance activity-cache.json
Merge branch 'master' into etherpad-archive-install

Conflicts:
	environments/qa/hiera/release.json