Merge "Fix resource problem in PrivateVolumeForgetTest" into sc-dev