Merged in Database changes
Commented out some unfinished bits to force a build.
fixing EnvironmentMonitor
* Renamed the public fsm methods.
* Attached the idle state to the orderconsumer by registering/deregistering the completion event handler on entry/exit state transitions.