Bug/883003 system groups validation

First commit related to bug https://bugzilla.redhat.com/show_bug.cgi?id=883003
Second is just random code cleanup. I found it when I was testing model creation...