Update storm2 setup for XML hardware approach.
Merge branch 'master' into prism2