bug #2601: Use ssh_public_key when updating a template
(cherry picked from commit d135098b31d4504c39e356a26d7ee6b58875c308)
Update year to 2014
Bug #2602: Fix DS name space on ESX
Merge remote-tracking branch 'upstream/one-4.4' into one-4.4