replaced rename() with copy_file, fixes EUCA-8320
fix typo
Merge branch 'maint/3.4/testing' into dev/nurmi/edgemaint