Merge branch 'develop-ascraeus' into develop

* develop-ascraeus:
  Revert "[ticket/11766] Hide edit, quote and delete buttons if topic is locked"