Fix Group and ResourceRole class toJson() methods
Remove unused MessageQueue base code