Upgrade port to 3.6.22 to address recently announced vulnerabilities

Security:	CVE-2012-6150
		CVE-2013-4408

(cherry picked from commit b89f8eb7f2c07cd7c5283280117c9a628ce35a2e)

Ticket: #3646