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

This reverts commit d26d314328461d40953eb7509cec8c76f4d3f49a.
Rebase from 'upstream'
Trimmed the branch to only the 3rdparty/nlopt sub directory