Updated pluginmanager callbacks to deal with upstream changes in D8