Bump terraform to 0.3.5

Bumping terraform to the latest version available.
Merge pull request #7984 from dhobbs/master

Bump terraform to 0.3.5