Modified states in reservation and lifecycle state machines.  Closes issue 87.