Merge pull request #691 from basho/bugfix-mw-aae-soft-exits

Fixed test to handle soft exits.