WEB-449: a few more post-merge conflict resolution fixes