Fix merge conflict
fix up HTTP stack for IPv6
Merge remote-tracking branch 'origin/master' into stats_refactor
Markups
Merge pull request #19 from Metaswitch/stats_refactor

[Reviewer: Matt][From: Alex] Refactor stats/stopwatch code to make it possible to integrate with homestead.
Add code changes to track rwquest latencies and penalties in the HTTP and diameter stacks (was previously developed as part of homestead)
Merge pull request #18 from Metaswitch/ipv6_harder

[Reviewer: Matt] Automated installation of IPv6 on AIO nodes.
Fix syntax error (bad merge??)
Merge pull request #20 from Metaswitch/latency_and_penalties

[No review required] Add latency and penalties to the HTTP stack.
PPR and RTR code review mark ups
Merge remote-tracking branch 'origin/master' into tsk2233

Conflicts:
	src/diameterstack.cpp
Change a log to WARN, correct some indentation
Merge pull request #21 from Metaswitch/tsk2233

Reviewer MATT: PPR and RTR code review mark ups
Improve logging, and fix logging-related hang when threads are killed while logging
Code review mark-ups
Merge pull request #22 from Metaswitch/logging

[Reviewer: Alex] Improve logging, and fix logging-related hang when threads are killed while logging
change LOG_WARN to LOG_WARNING as that was wrong
Merge pull request #23 from Metaswitch/tsk2233

change LOG_WARN to LOG_WARNING as that was wrong
Don't make httpstack depend on the homestead stats manager
Fix compiler errors