Squashed 'site_scons/' changes from 6e314f8..0098885

0098885 Use release directly for os_version for now

git-subtree-dir: site_scons
git-subtree-split: 0098885c68eeeeb64e885ccd7d8e9ab197486b8d
Merge commit 'f5fdb6474dc36b60772e5196f4b693b286b8e836'