Merge remote-tracking branch 'origin/master' into arcSpecToPrefs

build.gradle

src/main/java/org/nrg/xapi/rest/settings/AutomationApi.java

...in/java/org/nrg/xnat/configuration/ApplicationConfig.java

src/main/java/org/nrg/xnat/configuration/OrmConfig.java

...org/nrg/xnat/event/entities/ScriptLaunchRequestEvent.java

...rg/xnat/event/listeners/AutomationEventScriptHandler.java

...main/java/org/nrg/xnat/initialization/DatabaseConfig.java

...g/nrg/xnat/initialization/tasks/EncryptXnatPasswords.java

.../nrg/xnat/initialization/tasks/MigrateDatabaseTables.java

.../java/org/nrg/xnat/preferences/AutomationPreferences.java

...n/java/org/nrg/xnat/restlet/resources/SecureResource.java

...services/messaging/automation/AutomatedScriptRequest.java

.../messaging/automation/AutomatedScriptRequestListener.java

...nrg/xnat/turbine/modules/actions/AcceptProjectAccess.java

...ources/META-INF/xnat/migration/xnat-1.6-tables.properties

...resources/META-INF/xnat/preferences/automation.properties

...esources/META-INF/xnat/preferences/site-config.properties

.../resources/META-INF/xnat/spawner/site-admin-elements.yaml

src/main/webapp/scripts/project/projResourceMgmt.js

src/main/webapp/scripts/uploaders/AutomationBasedUploader.js