BZ-984854 (Add new css classes to fix the problem with the editing forms)
Merge remote-tracking branch 'origin/master'