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

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