Merge changes from topic "upstreamz" * changes: Update to latest FreeBSD upstream. Convert makefile to blueprint.