Stop using pkg_dir all over and correctly uninstall clients.

Fixes bug: #1192379

Change-Id: I66e0925120809a2e39f71fdab8b1f6c50d4abdef