Take mainstream version of gcovr
Fix bug in HTTPConnection - race condition between zmq_poll and cw_reset_time
Merge pull request #489 from Metaswitch/fix_recycle_hang3

[Reviewer: Ellie] Fix bug in HTTPConnection - race condition between zmq_poll and cw_reset...
Merge remote-tracking branch 'origin/dev' into gcovr-update

Conflicts:
	sprout/Makefile
Take OpenSSL 1.0.1g
Merge pull request #492 from Metaswitch/issue491

[Reviewer: Rob] Take OpenSSL 1.0.1g
Code review feedback
Merge pull request #481 from Metaswitch/gcovr-update

[Reviewer: Andy] Take mainstream version of gcovr
Move cwtest_reset_time() into BaseTest to avoid a gap between HttpConnectionTest deleting the LVC and something else still using it
Merge pull request #494 from Metaswitch/httpconnection_invalid_read

[Reviewer: Mike] Move cwtest_reset_time() into BaseTest to avoid a gap between HttpConnec...