rebase: Cleanup dead variables and origin references
treecompose: Add --add-metadata-string argument for versioning

This will be used by rpm-ostree-toolbox to inject version numbers for
the trees.