fixed DS-66: Losing config data when using customJobConfig
Merge branch 'develop' of github.com:Stratio/stratio-deep into develop
Merge branch 'develop' of https://github.com/Stratio/deep-spark into develop