Merge proposals dependent on lp://qastaging/~openupgrade-committers/openupgrade-server/6.1-fix_readthedocs_api

1. 6.1-fix_readthedocs_api
2. Dependent merge proposals