Merge changes I1de87d4c,I04c3405c

* changes:
  Add solidfire storage
  Add include to enable monitoring