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

This reverts commit 4634c1fd20205b497473f4f4b790b766c10ba1c1.
Rebase from 'upstream' (no changes)
Trimmed the branch to only the nasa_r2_common sub directory