Undeprecate some just-deprecated symbols in PluginManager.

Forgot about custom engines again :(
Merge branch 'master' into 4.0.x (undeprecate)
Make private PluginManager.clearPluginObjects, .startupPlugins