Override free user cap long term solution

Upstream modifications to "free user cap" often break our main-jh pipeline.

Trying to find a long-term solution to this problem.

Our temporary fix MRs:

• !1087 (merged)
• !1084 (merged)
• !1083 (merged)
• !1028 (merged)
• !1003 (merged)
• !558 (merged)

/cc EM @prajnamas