Merge pull request #4791 from apache/nouveau-indexmanager-improvements

Nouveau indexmanager improvements