Add common fixes for docs generation to template

Change-Id: Ieea0dc7ed7218e9bf5626e174e6184901efd9761