Merge "Add a '-l' shortcut for --log-level-display."