Merge "Add a note about overriding the journalctl nowrap default"