Merge "added missing cleanup of some nbnxn_cuda data" into release-4-6