Reorganize vars
Merge pull request #12098 from ZDroid/reorg

Group repo vars together in Jekyll config