Merge topic 'vs2015-fixes'

d4a26514 tbb: bring in tbb fixes for vs2015.
9f368aaf vs2015: fixes to silo build.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Shawn Waldon <shawn.waldon@kitware.com>
Merge-request: !449
25 jobs for master in 0 seconds (queued for 2 seconds)