Merge "Bug 548621 - Contract monitor refactoring, validation, test and docu"