Merge pull request #25 from daniellemayne/2014.03

bugz 4445: limit server actions to appropriate states
bugz 4618: return account number for testContext