Moved data store flush on feature type delete to event listener
Moved Datastore flush and added null check.
Flush cache and retry on failure to get feature type
Improved logging for DataStore flush