Branch b1_6

when setquota is executed, quota limitation on slaves is always reset which leads
to this bug. Now only first setquota and cancelling quota will reset quota
limitation on slaves.
b=16053
i=andrew.perepechko
i=johann