LPS-34414 - Layout Template Inconsistencies

Hey @natecavanaugh,

Attached is an update for http://issues.liferay.com/browse/LPS-34414.

Please let me know if you have any questions.  Thanks!