OPENUCB-294: Merging openucb-291-bw for updated rebuild.sh to address remnant files