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

This reverts commit afe3c203d9481e86fac15335ce49da3707c0d4a3.
Rebase from 'upstream'
Trimmed the branch to only the joint_states_settler sub directory