CRM-12910 fixes for leave revisions