Subject OPTIONS requests to overload controls and add deadlock detection for worker threads
Move to latest cpp-common
Use abort() instead of exit(1) when deadlock detected
Merge branch 'dev' of github.com:Metaswitch/sprout into iss630
Merge pull request #649 from Metaswitch/iss630

[Reviewer Matt] Subject OPTIONs to overload controls