Code clarity.
Add test case from NH-1863. Already working since at least 3.3.3.GA.
Add failing test cases for NH-2049.
Merge branch '3.4.x'