Merge "Support configuration of notify_on without Ceilometer"