4.3.2.final patch

For 4.3.2 I only applied the HV-912 changes. I did not move `ConstraintMapping` as on master (part of the "reducing accessibility of some classes and methhods". I think it is technically not necessary and it could break existing clients. @gunnarmorling, wdyt?
Oh, how did this became part of the back-port? I don't remember to have touched it in the original PR.