use shutil.move instead of os.rename

when moving config files
Merge pull request #5917 from minrk/shutil.move

use shutil.move instead of os.rename