merge -r 706091:706092 from continuum-1.2.x branch - fixed NPE when saving project group - [CONTINUUM-1937] rename variable