3.5 release notes: Add upgrade warning about environment fights
Improve intra-page linking re: environmentpath
Merge branch 'puppet35'