Merge pull request #1410 from minkbear/develop

Scrutinizer patches #2
fix all kind of white space errors
Version bump for mockery.

Since the issue we had with newer mockery versions is solved. We can continue using the master branch. Until next release
Merge pull request #1412 from jaapio/mockery_version

Version bump for mockery.
Merge pull request #1411 from jaapio/whitespace_fixes

fix all kind of white space errors