whitespace updates
Merge branch 'customer-meta-hardening'