Fixing issues with previous checkin on adding default facility.  Properly confirmed on zero_config builds, both for upgrade and install.