Engine: System Groups: few fixes for system groups UI

This is to address several errors observed navigating the UI.

This PR was previously ACKed and merged to the engine branch; however, we reverted the engine branch to a pre-master-rebase state after it was found that some commits did not make it over in the rebase.  So, want to get this merged back in.