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

This reverts commit e83d0ef8d869be580bd5f66fad1ed1adfb434dc1.
Rebase from 'upstream'
Trimmed the branch to only the amcl sub directory