#452 - Error when adding Category facets

(cherry picked from commit 8c8561aaad0bc82f6151a1edf1bfb69fd4923cde)
Merge branch 'BroadleafCommerce-3.0.x' into develop