Disambiguate names with role and organisation
Only disambiguate on duplicate names
Addressing pull request comments

  * Avoid `n+1` queries
  * Rename helper
  * Move active record call inside helper
Merge pull request #1676 from alphagov/disambiguatify-names

Disambiguate names with role and organisation