Moved self_dotdir and self._dotdirenv  so it is always set
Merge branch 'bug425_dotdir_Set_only_once' into devel