Previously the sample config was editted, but this incurred a
maintenance burden, and was also extremely hard to read. Since the
entire sample config is already commented out, this should have no
impact on how much maintenance is required to keep up with new required
config settings.
Change-Id: I14c1bb8d118774c182665ca1e595a646377976e4