(bug 60610) define variables mysite, linktrail, pep8 changes

synchronized with compat

Change-Id: I0ca73f541c4fbd018aa9f2db1bf2229c15f13f13
Merge "(bug 60610) define variables mysite, linktrail, pep8 changes"