More work on the upgrade path to be sure all the necessary modules get enabled...

More work on the upgrade path to be sure all the necessary modules get enabled and that date_popup formats get adjusted to formats that work with that module.