Remove references to obsolete fix_permissions function.
Port changes from b917a94 (omniti-ms) to the template branch.
Sync template branch infrastructure with master.

Change a few things to make it compatible with r151006 though.

Refs Github issue #22
Sync templates from master as well.

Refs Github issue #22