Merge "Bug 1417 - Removed extraneous pom dep on flow-management-compatibility"