Merge branch 'unstable' into high-availability
Merge branch 'high-availability' of github.com:telefonicaid/PopBox into high-availability
Remove unnecesary use of pool