Update CE code to include some refactor done in EE to do with import url
This is simply updating the code to match EE and avoid further conflicts related to import_data and import_url changes made on EE only.
Do not update/delete: Banner broadcast message test data
Do not update/delete: Notification broadcast message test data
This is simply updating the code to match EE and avoid further conflicts related to import_data and import_url changes made on EE only.