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

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