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

This reverts commit 5fd82c8c98a5b4fa00c8ff72e620d1840986eb74.
Rebase from 'upstream'
Trimmed the branch to only the amcl sub directory