Fix object removing.
Remove unused ucl object.
Fix object removing.

Conflicts:

	libpkg/pkg_manifest.c
Merge branch 'master' of github.com:freebsd/pkg

Conflicts:
	libpkg/pkg_manifest.c