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
Ignore bigcouch conflict errors, mainly coming from tapicero creating new users (Feature #6481)

There are potentially many tapicero daemons running, and they all try
to do the same thing at the same time. It is basically designed to
create race conditions. All tapicero daemons try to create the user db
at the same time. Only one of them wins the race and actually creates
it.

We need to fix this later (see https://leap.se/code/issues/6480) but
for now, we ignore them because conflict errors should be handled by the
applictation anyway.

Change-Id: I91095b1901d238e3d199954ba3716023d3fd49c1
Change nagios mail To: Header to contain the actual platform environment's contact email (Bug #6466)

Change-Id: Ib86ae771e0ac3b6f329a517a8a31c9ec54d33a05
add soledad sync test to `leap test`. closes #6431
Merge "Change nagios mail To: Header to contain the actual platform environment's contact email (Bug #6466)" into develop
Merge branch 'develop' into pixelated/develop