please, check my recent 2.0 and 2.1 branches fix:
https://github.com/389ds/389-ds-base/pull/5480

Also, when you have time, please check my Ansible renaming and Design work:
https://github.com/mreynolds389/389wiki/pull/79

Sincerely,

Simon