Revert "Trimmed the branch to only the openni_wrapper sub directory"

This reverts commit fa9d4fb77a6fce28385dfbcc72f3bfee78f0077c.
Rebase from 'upstream'