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
CLC-2797 - Resolve issue with 'Switch to CCN input' button
Merge pull request #2304 from redconfetti/CLC-2797-fix-ccn-mode

CLC-2797 - Resolve issue with 'Switch to CCN input' button