CLC-3499 Protect against null subcats; fix blank User Roles select box
Merge pull request #2303 from ctweney/clc-3499

CLC-3499 Protect against null subcats; fix blank User Roles select box