merge-scripts update to upstream and also minor fixes for our use
This is a merge to sync with latest master from upstream.
Last commit on upstream merged is:
commit a306243a (HEAD -> funtoo-master, origin/master, origin/HEAD, origin-master)
Author: Daniel Robbins <drobbins@funtoo.org>
Date: Wed Jul 31 04:42:32 2019 +0000
A small fix for injecting a file that already exists.
Changes to be committed:
modified: bin/distfile-spider
modified: bin/fastpull-daemon
new file: bin/indy-kit-metadata-update
new file: bin/kit-regenerate
modified: bin/merge-all-kits
modified: bin/qa/kit-set-mismatch
modified: bin/trickle
modified: modules/merge/config.py
modified: modules/merge/extensions/xproto.py
modified: modules/merge/merge_utils.py