1. Added mechanism to restore current plugins back to storage configurations.  User may have workspaces defined that are not included in the plugin template, and without this change, these workspaces will be lost forever.

2. Made uploading of plugins configurable.  To skip uploading the template file, pass to the maven command line the option

-Dload.plugin.template=false

This flag is by default set to true.  Note that the option can't be directly added to the runtests script.