Restore model 21 to 4.4. Moved 4.5's 21 & 22 to 22 & 23
Merge branch 'issue/2637-implements-default-account-failsafe' of github.com:wordpress-mobile/WordPress-iOS into issue/2637-implements-default-account-failsafe