site.pp changes for pmtpa x1 shard

Change-Id: I3563b8024c1eca669ad0b8630ee2f1155d57afa1
Merge "site.pp changes for pmtpa x1 shard" into production