SWITCHYARD-1538 - Updates to allow better handling of promoted refs