Update the locator models to support codePool as parameter and default back to local not present
Update the locator definitions to allow the codePools as parameter