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

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