Added code for CROSSDATA-152 & CROSSDATA-153
Merge branch 'develop' of https://github.com/Stratio/crossdata into develop