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

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