Whitespace and code standard update.  No logic changes
Merge remote-tracking branch 'origin/customer-meta-hardening'