Set up our logging functionality earlier
Merge remote-tracking branch 'origin/dev' into earlier_logging
Take mainstream version of gcovr
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 branch 'dev' into earlier_logging
Merge pull request #494 from Metaswitch/httpconnection_invalid_read

[Reviewer: Mike] Move cwtest_reset_time() into BaseTest to avoid a gap between HttpConnec...
Applied code review feedback
Disable dependency checking of extra test build objects
Break options parsing into two parts, so that we get logging-related options first and can then log out any errors with other options
Merge pull request #441 from Metaswitch/earlier_logging

[Reviewer: Ellie] Set up our logging functionality earlier
Merge pull request #495 from Metaswitch/test_build_dependencies

[Reviewer Andy] Disable dependency checking of extra test build objects
Merge dev in to sto563 (again!)