Branch b1_4

Branch b1_4
This merges a change from b1_4_quota that was never landed on b1_4, which
removes some extraneous quota-induced overhead in the llap structs, growing
the size of each one noticably (and there are a lot of them, one per page).
It also removes an extra set of upcalls per page.
b=6929
r=niu