Escaping xml in '423 Locked' response. Fixes Issue #341.
Updated changelog
Merge branch '1.6' into 1.7
Updated changelog