Merge pull request #3700 from neddp/develop

Fix SCIM DateTime Filter Timezone Parsing

Author: duanemay

server/src/main/java/org/cloudfoundry/identity/uaa/resources/jdbc/SimpleSearchQueryConverter.java

@@ -339,7 +339,7 @@ private String getParamName(Map<String, Object> values, String paramPrefix) {
 
     private Object getStringOrDate(String s) {
         try {
-            DateFormat timestampFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'");
+            DateFormat timestampFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSX");
             return timestampFormat.parse(s);
         } catch (ParseException x) {
             return s;