adds CPK data sources to end of Data Sources Listing in CDE
and also:
 - code cleanup
 - removal of guava lib dependency
(dcleao: repeating reverted and broken commit by Rafael Gomes; fix follows)
[FIX] (Save Dashboard Empty .CDA) Saving a dashboard would result in an empty CDA file, due to dependency on cdaSettings, which was not being filled anymore.