Take mainstream version of gcovr
Merge remote-tracking branch 'origin/dev' into gcovr-update

Conflicts:
	sprout/Makefile
Code review feedback
Merge pull request #481 from Metaswitch/gcovr-update

[Reviewer: Andy] Take mainstream version of gcovr