qa/187: _cleanup in 2nd trap to restore pmcd auto-restart
qa/187: _cleanup in 2nd trap to restore pmcd auto-restart

qa/187 was leaving the pmcd service with Restart=no, affecting
all pmcd/systemd related tests thereafter.

adfernandes/pcp,adfernandes/pcp,adfernandes/pcp,adfernandes/pcp,adfernandes/pcp,adfernandes/pcp,adfernandes/pcp,adfernandes/pcp