fix bug in autoami template
make autoami template work with puppet 3 too
Fix error "--server= already defined in puppet" with puppet 3