Merge pull request #9007 from mpg/checkbox-3.6

Add 3.6 backport checkbox to the PR template