Please review the attached patch for:
PKI TRAC Ticket #832 - Remove legacy 'systemctl' files . . .
This patch has been tested with both GUI and non-GUI configurations.