fix #584

Hope this is all, now.
tag suggest not admin plugin

Since we are force-loading it for the back end it does not need to be
flagged as an ADMIN_PLUGIN
Merge remote-tracking branch 'origin/master' into 1.4.6
Clone installs should not alter setup script protection
Merge remote-tracking branch 'origin/master' into 1.4.6