BC fixes for habtm. Closes #3545.

Signed-off-by: Rachman Chavik <rchavik@xintesa.com>
Merge branch '2.2'
BC fixes for disabled checkboxes

see: d504642
see: #3545

Signed-off-by: Rachman Chavik <rchavik@xintesa.com>
added test to disprove #3588