Reinstating NetApp section that was nuked in merge e9c86c8
Added new configurable properties for NetApp
Broke into sections for readability