Merge "Add manila.conf parameters for NetApp Active IQ weigher"