Backported Cody Hoag's - LRDOCS-529 Addressed Layout Template comments and provided several other small changes
Merge pull request #532 from jhinkey/LRDOCS-529-6.1.x

LRDOCS-529 6.1.x Addressed Layout Template comments a...