Further changes to the reseller implementation
Summary: See T452951
Test Plan: ./phpunit
Reviewers: #hkccp_developers, machniak, vanmeeuwen
Reviewed By: #hkccp_developers, vanmeeuwen
Subscribers: machniak
Differential Revision: https://git.kolab.org/D2635