Check out 1.6 branch of googletest instead of head
Merge branch 'scaffold' into develop
Do not reference boost in scaffold code