LPS-34414 - Layout Template Inconsistencies

http://issues.liferay.com/browse/LPS-34414