Respect the customization of user-emacs-directory

This allow developer to switch easily between multiple installations
directories, using e.g.:

emacs -q --eval '(setq user-emacs-directory "~/tmp/emacs-test-el-get")'
Merge pull request #1060 from d-p/4.stable

Respect the customization of user-emacs-directory