Updating for 3.1.2 release. See DOC-481
Updating for PE 2.8.5. See DOC-482.
Merge branch 'master' of github.com:puppetlabs/puppet-docs

Conflicts:
	source/pe/3.1/install_upgrading.markdown