Fixes for RF-13159 and RF-13185: Updates to GAV and BOMs to prepare for reorg