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

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