Removed per developer list discussion to keep non-code artifacts out of Git.
CAY-1952 Undeprecate (actually restore) ObjectContext.deleteObject(..)
Squashed commit of the following:

commit 3519c22c602feaf0962a5ce6f14c1cd45cd4278d
Author: alexkolonitsky <Alex.Kolonitsky@gmail.com>
Date:   Fri Aug 29 13:30:58 2014 +0300

    CAY-1946 CDbimport improvements

    Basic cdb import improvement: use db merge if model already exist
    1) added DbLoaderConfiguration class; this class responsibility should be provide to DataLoader all necessary information
    2) DbImportAction - this class will check availability of dataMap file and do merge if it is exist otherwise just load model from db
    3) DbImportParameters - was renamed to DbImportConfiguration and also responsible fo construction of necessary objects for during import process
    4) functional or end-to-end test for maven plugin basic usage scenarios
    5) XmlUnit - for xml file comparison
    (cherry picked from commit c2c7308)

commit f40bdf45413941ec57e02052675d681fc3ff5e4d
Author: alexkolonitsky <Alex.Kolonitsky@gmail.com>
Date:   Fri Aug 29 13:43:55 2014 +0300

    CAY-1946 CDbimport improvements

    Basic cdb import improvement: use db merge if model already exist
    1) added DbLoaderConfiguration class; this class responsibility should be provide to DataLoader all necessary information
    2) DbImportAction - this class will check availability of dataMap file and do merge if it is exist otherwise just load model from db
    3) DbImportParameters - was renamed to DbImportConfiguration and also responsible fo construction of necessary objects for during import process
    4) functional or end-to-end test for maven plugin basic usage scenarios
    5) XmlUnit - for xml file comparison
CAY-1946 CDbimport improvements

centralizing test dependency version management on topm of Alex's patch
fix tests
CAY-1949 Search in configuration fields (Catalog, Schema) in DbEntity

patch by Savva Kolbachev (d1e506c) with some minor edits
CAY-1772 Real support for DbEntity catalogs

must set default catalog for new DbEntities
no change

formatting, removing empty comments
 CAY-1943 XML file not deleted when a DataMap is deleted from the project

* parts of pull request #13
Merge branch 'master' into develop-devacfr