Merge pull request #184 from fpapon/SHIRO-669

[SHIRO-669] Included a boolean flag in FirstSuccessfulStrategy to bre…