raise CFoundry errors instead of UAA when possible

Change-Id: I7ddb01d987f0c68acb30e724a0122f4fba37bc05