LRDOCS-824-6.1.x Backport info on Site Pages -> Advanced -> Page merging, and also some info on adding Site-wide JavaScript to 6.1.x
Merge pull request #737 from jrao/LRDOCS-824-6.1.x

https://issues.liferay.com/browse/LRDOCS-824