Convert --clusters (and --cluster) option parsing to new form.

There are two equivalent long-form options. Add a new LONG_OPT_CLUSTER
to the enum to distinguish which form is used. (Needed for tracing at
a later point in time.)