Revert "Trimmed the branch to only the 3rdparty/nlopt sub directory"

This reverts commit 322b7f4bceea098298071fba9f9b6c02adfc633c.
Rebase from 'upstream' (no changes)
Trimmed the branch to only the 3rdparty/nlopt sub directory