Lps 48632 Clean up logic in EhcacheConfigurationUtil