[overlord-issues] [JBoss JIRA] (SRAMP-512) Cleanup and improve all datasources