WW-4109 WW-4154 Reverts to previous behaviour where both ParametersInterceptor and ParameterNameAware must accept parameter