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

This reverts commit 773139ac6acee4badda6e37aa47e6028bcc435d7.
Rebase from 'upstream' (no changes)
Trimmed the branch to only the amcl sub directory