refactored locator strategy implementetion
Merge branch 'master' of https://github.com/Talend/tesb-rt-se
refactored locator strategy code