As suggested in John Garbutt in I7e1986c5f11356060cc9db12605b1322c39e79c0, move the quota config options into a config group of their own. Change-Id: Ie06a370868f01fb9a1cc246a77d7823fac83e70e