Push ATF code from stable/9 into stable/8

Minor adjustments were made to make things work in stable/8

Sponsored-by: EMC Isilon