A fix for bug #8366.  It now correctly makes the "None" option to be objects for customers and departments.