De-deprecate ParameterMap for now

It's not like we don't know it sucks, but having it marked @deprecated
makes it hard to clean up code using ParameterMap.
NMS-7122 fix HttpClient usage in a number of codepaths