tracepp fix for OP

Change-Id: Ie93025e9dfab8f2a1a3085eed26e70fa22766d04
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/14929
Reviewed-by: Guillermo J. Silva <guilsilv@us.ibm.com>
Tested-by: Guillermo J. Silva <guilsilv@us.ibm.com>
Fix issues with state machine handler

Change-Id: I6cc2af8530aa106d7c231ce2c45dd5c7e7576885
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/14958
Reviewed-by: Andrew J. Geissler <andrewg@us.ibm.com>
Reviewed-by: Guillermo J. Silva <guilsilv@us.ibm.com>
Tested-by: Guillermo J. Silva <guilsilv@us.ibm.com>