Comment updates from default config

No changes, all comments. Makes for cleaner diff when apt complains
about config being different.

Change-Id: I3e41b6664ee3bb6a4297f1e638d5471109014a1a
Merge "Comment updates from default config" into production