[c=fnordahl,r=gnuoy] Add more flexible authenticate_keystone function
                     Retain existing authenticate_keystone_* functions as
                     compability layer with calls to new function.