DEVELOPER-358 - contributor and author mapping improved