Merge branch 'master' into beta

* master:
  Do not rebuild Carton on production
  Correctly discard carton.lock changes on prod
  Do not allow modifying collections a user does not own