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

...nd provided several other small changes

This is ready for upstream 6.1.x. Thanks.