Adding hack to support Mozilla and AeroGear push networks

When we added the batch notification support I did not take into account
that batch notifiations would not work with Mozilla's push network. This
is a hack to support both for Kris talk and further discussion regarding
this must take place before we can use batch notifications for the
Unified Push Server.