Stickit refactoring for node group checkboxes

Change-Id: I97c8566fda7d22d19cf89628fc1d5cab593e8060
Merge "Stickit refactoring for node group checkboxes"