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

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