Fix race condition and a stack error caused by too old changesets#1025

marcelklehr merged 3 commits intoether:developether/etherpad:developfrom

amtep:developamtep/etherpad-lite:developCopy head branch name to clipboard