OOZIE-1242 Dryrun option for workflows mentions version 3.4 when it should be 3.3.2 (rkanter)

git-svn-id: https://svn.apache.org/repos/asf/oozie/trunk@1454188 13f79535-47bb-0310-9956-ffa450edef68
OOZIE-1233 Add ability to configure Oozie to use HTTPS (SSL) (rkanter)

git-svn-id: https://svn.apache.org/repos/asf/oozie/trunk@1454203 13f79535-47bb-0310-9956-ffa450edef68
Merge remote branch 'origin/trunk' into trunk-gd