Branch b1_6

Split backup and restore synopsis into separate lines so that it is clear
which option is relvant only to backup or restore.  Move the major operators
to the beginning of the option list.
b=14117