Fixes a case where removing the plugin from disk would fail silently. Also moves pluginStore remove after we remove from disk, so 'docker plugin ls' doesn't isn't empty in case it errors out. Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com> Upstream-commit: fb11164c4f71315c96ddf3de46ff4689a5bac59c Component: engine