Make sure a PluginWrapper sets the plugin name, if specified, when a
plugin is created.
Merge branch 'dev' into multidecoder-name

Conflicts:
	CHANGES.txt
Merge pull request #572 from mozilla-services/multidecoder-name

PluginWrapper should set plugin name.