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

src/main/java/org/nrg/xapi/model/event/EventClassInfo.java

src/main/java/org/nrg/xapi/rest/event/EventHandlerApi.java

...ava/org/nrg/xapi/rest/notifications/NotificationsApi.java

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

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

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

...at/event/listeners/AutomationCompletionEventListener.java

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

...org/nrg/xnat/restlet/actions/AutomationBasedImporter.java

src/main/java/org/nrg/xnat/services/XnatAppInfo.java

...java/org/nrg/xnat/turbine/modules/actions/AddProject.java

...a/org/nrg/xnat/turbine/modules/actions/ModifyProject.java

...resources/META-INF/xnat/entities/xnat-entity-packages.txt

src/main/webapp/page/admin/data/config/site-setup.yaml

src/main/webapp/setup/index.jsp