fix import of getToolByName, use origin location
Merge branch 'master' of github.com:plone/plone.api