e353d14550
To prepare the router's for the eventual removal of the router_options parameter, the API option arguments should not be used. The parameters can be substituted by tokenizing the value of the parameter that is still stored as a part of the service.