Update to provider locator.
Merge pull request #224 from gstoeckel/SystemEngine-1.1

Update to provider locator.