allow either source or content to be used as the file distribution method
Merge branch 'f_checkplugin'