Merge "Fix vCPE VNF vBRG image build issue"