Moved self_dotdir and self._dotdirenv  so it is always set
Merge remote-tracking branch 'devel/bug425_dotdir_Set_only_once_release' into release