update es to use dpkg
Merge remote-tracking branch 'upstream/master'