Issue #2109215 by dshields: Inconsistent markup in provided panels layouts.