Bug 880161 - Allow partial functionality of top up or deactivating it completely.
Merge pull request #10248 from lodr/bug-880161-allow-partial-topup-functionality

Bug 880161 - Allow partial functionality of top up or deactivating it completely.
r=jmcanterafonseca