Import apt version 2.4.0
Misc changes