msftidy fix for coldfusion exploit
Decaps Siemens (consistent with other modules)
Land #2480, @todb-r7's changes for weekly update
Merge 'upstream-master' into release

Picks up #2480 as well.