(unstable) [fixed] pets now follow and stay when executed in combat
(unstable) [fixed] pets will now revert back to their follow and stay
states after combat ends -- mantis 5381

Change-Id: I3378a0c562f3c28ef43da4eb7eb312781a764c2d