Add a '-q' option to pkg check.  This increasingly mis-named "quiet
mode" is more intended for scripting use than anything else, so no
progress meters and frequently work entirely silently if no errors are
encountered.
Add the new -q flag to the pkg check commandline, now we have the
capability.
Document the new -q option to pkg check
Allow running 'pkg lock -l' without specifying any packages to lock
and hence without needing privileged access to the DB.

Free some variables used when listing the locked packages

Some whitespace cleanup

This makes pkg actually behave according to the intent expressed in
issue #635
Fix a regression breaking pkg convert
Add tests for the regression
Update documentation for pkg lock now it is possible to use 'pkg lock
-l' stand-alone, and without needing privileged pkgdb access.
Merge branch 'master' of github.com:freebsd/pkg
Round the note size up correctly.

ELF notes are 4-byte aligned, this fixes the size, which may not be a
multiple of 4, to round them up correctly. This stops pkg crashing on
armeb.
Only show the @dirrm warning once.

Issue:	#1036

Conflicts:
	libpkg/pkg_ports.c
Import from fossil 3 way merge code
Remove check on return, the caller will have to check to know what to do
Add a minimal regression test for 3 way merge
plug memory leak in 3way merge test
Do not add a trailing newline when not necessary in 3 way merge
Add more test for 3 way merge
Garbage collect now no-op code

Remove all notions of keep for files and directories
Remove all notions of try from directories
Adjust documentation
Remove garbage
pkg_file is only used internally no need for accessors for other cases pkg_printf is enough