Merge "Moving composer@2.1 library away from shared"