Merge "fix for BUG-621 - convertion from xtend to java in compatibility/flow-manageme...