added missing branch-alias in composer file
Merge branch '2.1' into 2.2

* 2.1:
  added missing branch-alias in composer file
updated branch-alias version