Merge "Fix alternative names for barbican" into release/2019.2.0