While we're at it, abort on *any* failure in setup_keystone. Change-Id: I08510a4825366a3ba1a8d667905cd9141fd5426e