Merge "Add tempest_keystone in airship gate"