Merge "Switch to newer openstackdocstheme and reno versions"