#6401: Unblock Koji for (unretired) surf and add f24 branch