Fix Version/s: None
Need this for dev work to be lower friction. Jenkins etc will use scons preferentially, so just the requisite scripts and it should Just Work.
A couple of changes requested on the PR but otherwise this is acceptable.
I understand that discussions are occurring related to other cleanups of this code and its relationship with upstream.