Disambiguate names with role and organisation
Only disambiguate on duplicate names
Fix report-a-problem form alignment with new static

On a version of `static` that includes the [report-a-problem improvements](https://github.com/alphagov/static/pull/441),
the report-a-problem form is misaligned. This change fixes that issue, while not really
breaking anything when `whitehall` runs against the old version of `static`.
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
Use govspeak version with fix for address markdown

www.agileplannerapp.com/boards/173808/cards/5680

the address markdown ($A) required an extra blank
line preceding it for preview toggle to function.
this was confusing for the editors.

this change fixed the issue:
https://github.com/alphagov/govspeak/pull/43
Merge pull request #1687 from alphagov/use-govspeak-with-address-markdown-fix

Use govspeak version with fix for address markdown
Merge pull request #1686 from alphagov/report-a-problem-styling-with-new-static

Fix report-a-problem form alignment with new static