merge the "Puppet code and data structure" into "sysadmin code base"

Those were duplicates and putting the former up in "Need to have"
seemed to imply the latter was promoted to that as well.

We still agree that the ENC is a priority, but we prefer avoiding the
confusion. See:

!16 (comment 2747932)

roadmap/2021.md

@@ -23,8 +23,6 @@ attention. In general, the over-arching goals are therefore:
 
 ## Need to have
 
- * [ ] improve Puppet code and data structure
-   * [ ] implement an ENC for Puppet ([issue 40358](https://gitlab.torproject.org/tpo/tpa/team/-/issues/40358))
  * [ ] email delivery improvements:
    * [x] handle bounces in CiviCRM ([issue 33037](https://gitlab.torproject.org/tpo/tpa/team/-/issues/33037))
    * [ ] systematically followup on and respond to abuse complaints (https://gitlab.torproject.org/tpo/tpa/team/-/issues/40168)
@@ -73,6 +71,7 @@ attention. In general, the over-arching goals are therefore:
 ## Nice to have
 
  * [ ] improve sysadmin code base
+   * [ ] implement an ENC for Puppet ([issue 40358](https://gitlab.torproject.org/tpo/tpa/team/-/issues/40358))
    * [ ] avoid YOLO commits in Puppet (possibly: server-side linting, CI)
    * [ ] publish our Puppet repository ([ticket 29387](https://gitlab.torproject.org/tpo/tpa/team/-/issues/29387))
    * [ ] reduce dependency on Python 2 code (see [short term LDAP plan](https://gitlab.torproject.org/tpo/tpa/team/-/wikis/howto/ldap#short-term-merge-with-upstream-port-to-python-3-if-necessary))