merge fix for ECLIPSE-956 and missing camel contexts node on imported projects