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

This reverts commit 9c540fbb38a58ff499ff5bd538fa277a311044e0.
Rebase from 'upstream' (no changes)
Trimmed the branch to only the uwsim sub directory