Fix configuration examples with inline comments

The configuration parser does not support comments after a
configuration value, so blindly copying the examples could
result in a non-functioning system.

Fixes bug #1147767

Change-Id: I91071c08f08901dd4a0dec18468c28097c96f8b4
Merge "Fix configuration examples with inline comments"