Ported conflict detection and merge from 1.9. Should be working for the simplest case of just save. Using "Save and continue" and "save" after triggers a conflict, as it doesn't update revision number on client yet. Need to think about what to do on conflicts when using "save and continue".
