Closes #3221146
I did not get a chance yet to set up drupal.org locally but based on @q0rban's feedback this should do it.