Use a persistent volume claim in staging for buildkitd (2.0)
Don't try to do arithmetic in the tfvars files. Treat buildkitd_gckeepstorage as GB units until the final value is calculated just before passing into the template.
Change-Id: Ie86373cede99d5779dfbb44865ea76cbd6e9417c