1) Changed inform messages of cm_factory so that they report current state and desired state,
instead of event_type/message. Also correspending changes to omf6 script are completed.
2) Some refactoring.
3) Some clean up.