Minor bugfixes. New state retry
Merge branch 'retryBuckets' of github.com:telefonicaid/Rush into retryBuckets