Updates from use of repobuild

Here are a few features / fixes that accomodate our use of repobuild.  Feel free to pull or not.