Use Upstream training version of the cleaned up conf.py. Change-Id: Id493b417365c8a42f8e77214b7e2fdf2c1486c53