Fix CVE-2014-0160 patch to always upgrade packages rather than just ensuring their presence
Merge remote-tracking branch 'upstream/release' into combine-399-400-401
Update erlang-solutions apt-key path