Merge pull request #624 from seffenberg-naspers/fix_apt_key_with_userinfo