minor linting

Change-Id: Idf550ed004bcb42d6e19ac0a2c5286f52a390935
Use $hostname to locate tor.key. Fixes #6478

Change-Id: Ibbe3687d5a773b444f6e9145bf235aaeea637e1d
Use include to avoid redeclaration of class { 'tor::daemon': }. Fixes #6479

Change-Id: Ibd1b1eef7afca10cf2a2d56a24e703636d6a52c6
Merge remote-tracking branch 'gerrit/develop' into develop

Change-Id: I2fa85918af8199fbc41bb4e58dae6c78911ab626