[DO_NOT_MERGE] [origin-ui-180] rhc support for multiple servers

If an *option* was overridden as an *argument* then I need to transport it from options to arguments. Not doing that will cause "Too many arguments passed in" (not being processed as an argument).
Then I collect overridden ones to free their arg slots a little below.