Merge "Add LBaaSv2 Barbican support"