Correct (?) path for esmp
Merge branch 'lesser_pip_no_distribute' into devel