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

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