merged STORM-222 (expat.h not found on STANDALONE)
merged STORM-222 (expat.h not found on STANDALONE)

gabeharms/firestorm,gabeharms/firestorm,gabeharms/firestorm,gabeharms/firestorm,gabeharms/firestorm,gabeharms/firestorm,gabeharms/firestorm,gabeharms/firestorm,gabeharms/firestorm