Updated to utilize the new ssi-servlet utility JAR.
Merge remote-tracking branch 'origin/master'