r12913: missed merge to fix BUG 3391; ensure we can lookup account policies