Cluster setupMaster can be invoked more than once, and fork can provide it's own options

#6264

Minor bug useful additions.