Merge branch 'v1_9' of https://github.com/pwm-project/pwm into v1_9

# Conflicts:
#	client/pom.xml

client/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.pwm-project</groupId>
         <artifactId>pwm-parent</artifactId>
-        <version>1.9.3-SNAPSHOT</version>
+        <version>1.9.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>