merge -r 706085:706086 from continuum-1.2.x branch [CONTINUUM-1937] fixed NPE when editing project group