Backport minor Themes 6.2 changes for 6.1
Backport minor Layout Template 6.2 changes for 6.1
Merge pull request #701 from jhinkey/themes-dev-guide-6.1.x

Themes dev guide 6.1.x