Merge branch 'fix/0.1.1/PIDFile' into release/0.1.1
Resolves CROSSDATA-249
Merge branch 'release/0.1.1' of https://github.com/Stratio/crossdata into develop