Storage Pool support
Merge pull request #144 from daniellemayne/develop

Storage Pool support
Merge pull request #143 from unwin/develop

FB 4924 - NPE issue. Hoping to fix, or provide better diagnostics.
Fix Merge
Merge branch 'unwin-develop' into develop
changed tests from include to exclude