Inject file validators and scheme from the plugin.
Merge branch '7.x-1.x' into fix-access