However, while fixing this, I noticed that the call to $services.rendering.parse breaks when the document contains special characters (for instance vowels with french accents HTML escaped. This causes the velocity service to return a "no merge detected" message, causing a save error if there actually is a conflict.
I suppose it is a separate issue though. I'll open a new Jira for it.