Merge branch 'portmerge' of git-public.flux.utah.edu:/flux/git/users/wbsun/emulab-devel into portmerge