update upstream netapp script and enable further checks

Change-Id: Ic07baba2dab4a09390067032a0eec3614095e84c