for my 14.04 trusty branch
Merge branch 'trusty' into patchwork
apply 0002 (secure with ssh keys)