Updated authentication controller calls... originally changed on wrong
branch.
Merge branch 'rc3' into feature-paypalexpress