Merge pull request #46 from daniellemayne/2014.03

bugz 4445: limit server actions to appropriate states: 2014.03