Merge "Do not check for id in the keystone output"