Merge "Adding support for henshin_diagram files in the CPA UI plugin"