First approach for solving issues CROSSDATA-139 & CROSSDATA-151
Merge branch 'develop' of https://github.com/Stratio/crossdata into develop