Fix failing tests after merge
Merge branch '2.5' into 2.6

* 2.5:
  Fix failing tests after merge
  fix ocramius/proxy-manager dependency version