Lps 48362 Clean up logic in EhcacheConfigurationUtil