Merge "Add edgecloud project to featureproject"