Merge branch 'task/JAL-3608_property_set_laf_and_tests_from_Release_2_11_1_Branch...