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

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