publichtml: tidy

Change-Id: I84d5ec279f881b545d5f67b19bce98a51e887c24
Merge "publichtml: tidy" into production