Adding logic for CROSSDATA-316
Merge branch 'develop' of https://github.com/Stratio/crossdata into develop