Merge branch 'hotfix/JAL-1521' into develop

Conflicts:
	.classpath
	RELEASE

diff --cc .classpath
index 73cb502,21bbab7..ada4002
--- 1/.classpath
--- 2/.classpath
+++ b/.classpath
@@@ -43,14 -43,13 +42,16 @@@
        <classpathentry kind="lib" path="lib/jdas-1.0.4.jar"/>
        <classpathentry kind="lib" path="lib/spring-core-3.0.5.RELEASE.jar"/>
        <classpathentry kind="lib" path="lib/spring-web-3.0.5.RELEASE.jar"/>
 -      <classpathentry kind="lib" path="lib/VARNAv3-9-dev.jar"/>
        <classpathentry kind="lib" path="lib/groovy-all-1.8.2.jar"/>
        <classpathentry kind="lib" path="lib/min-jabaws-client-2.1.0.jar" sourcepath="/clustengine"/>
 -      <classpathentry kind="lib" path="lib/resolver.jar"/>
 -      <classpathentry kind="lib" path="lib/serializer.jar"/>
 +      <classpathentry kind="lib" path="lib/json_simple-1.1.jar" sourcepath="/Users/jimp/Downloads/json_simple-1.1-all.zip"/>
 +      <classpathentry kind="lib" path="lib/slf4j-api-1.7.7.jar"/>
 +      <classpathentry kind="lib" path="lib/log4j-to-slf4j-2.0-rc2.jar"/>
 +      <classpathentry kind="lib" path="lib/slf4j-log4j12-1.7.7.jar"/>
 +      <classpathentry kind="lib" path="lib/VARNAv3-91.jar"/>
 +      <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/plugin.jar"/>
+       <classpathentry kind="lib" path="lib/xml-apis.jar"/>
+       <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/plugin17"/>
        <classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
        <classpathentry kind="output" path="classes"/>
  </classpath>