Added cookie controlled system parameter merge
Applies to user parameters olny
Merge branch 'master' of https://github.com/slipstream/SlipStreamServer
Completed cookie controlled sys param merge into user params
Added test and using instance name rather than default service name