Update storm2 QPD to reflect changes to nicontrol.
Fix merge conflict.
Sync with storm2.