OZP-10: override toJSON to account for attributes that model or collection
Merge branch 'master' of https://github.com/ozoneplatform/ozp-commons into feature/ozp-16-migrate-dashboard-switcher