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

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