Retire operator|(File f, Rank r)

Use make_square() instead. Less fancy but
more clear.

No functional change.
Trivial formatting in ucioption.cpp

No functional change.
Merge remote-tracking branch 'upstream/master'