OOZIE-1410 V2 servlets are missing from ssl-web.xml (rkanter, rohini via rkanter)

git-svn-id: https://svn.apache.org/repos/asf/oozie/trunk@1493155 13f79535-47bb-0310-9956-ffa450edef68
OOZIE-1414 Configuring Oozie for HTTPS still allows HTTP connections to all resources (rkanter)

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