Merge branch 'master' into stable

DEPLOYMENT.md

@@ -4,12 +4,11 @@
 - [ ] Commit to master to make sure that the master branch is clean and all commits are pushed to origin
 - [ ] `git checkout stable`
 - [ ] `git merge --no-ff master`
-- [ ] (Optional) You can now deploy stable to kommul-dev (`./release.sh $VERSION_NUMBER-RC-$RCNUMBER`)
+- [ ] (Optional) You can now deploy stable to dspace-dev (`./release.sh $VERSION_NUMBER-RC-$RCNUMBER`)
 - [ ] Make sure that the stable branch is clean and all commits are pushed to origin
 - [ ] `git checkout production`
-- [ ] `git checkout $HASHID -- .`
+- [ ] `git checkout -b v$VERSION_NUMBER $HASHID -- .`
       The $HASHID being the commit were the last merge from stable happened (before clarindev2clarin.sh changes were committed)
-- [ ] `git checkout -b v1.3-$VERSION_NUMBER`
 - [ ] `git merge --no-ff stable`
 - [ ] resolve conflicts and commit
 - [ ] Change the version number and the registry branch of the images in all deployment yaml files