HV-682 Fixing wrong origin for cross-parameter constraints in hierarchies
HV-687 Always using type of the current bean when adapting constraint scopes