So, I guess that the current patch will work just fine, so +1 on that, but it does make
updates out of sync with updates-testing.
Before changing these paths, we need to ask adamw whether this will break his tooling, and
possibly coordinate with him.