resolve conflict
GenericPKQueryIntegerFilterTest
Merge branch 'upgradeToCrossdata0.1.1' of https://github.com/Stratio/stratio-connector-commons into upgradeToCrossdata0.1.1

Conflicts:
	connector-commons-ftest/src/test/java/com/stratio/connector/commons/ftest/functionalDelete/GenericDeleteTest.java
Merge branch 'upgradeToCrossdata0.1.1' into develop

Conflicts:
	connector-commons-ftest/src/test/java/com/stratio/connector/commons/ftest/functionalDelete/GenericDeleteTest.java