JAL-653 JAL-1766 merge 290b1 - fix erroneous conflicts on test asserts