Pull in stuff for Closure ADVANCED_OPTIMIZATIONS.
Merge branch 'master' into closure_advanced
Restructure for Closure.

This will allow Closure's avdanced optimizations to work for the Incident class.