Fixed top file to align with dev-vm-saltfs changes. Added aws.cli.