[CXF-5941, CXF-5961] Controlling the order of inherited parameters, fixing the regression, patches from Alexey Markevich applied with some extra code