Pull in a new lua_sandbox to fix JSON encoding of empty strings
Merge pull request #754 from mozilla-services/sandbox_json_serialization

Pull in a new lua_sandbox to fix JSON encoding of empty strings
Fix the max_hosts check to properly reclaim expired hosts when at capacity
Merge pull request #756 from mozilla-services/cbufd_host_aggregator

Fix the max_hosts check to properly reclaim expired hosts when at capaci...
Merge remote-tracking branch 'origin/versions/0.5' into dev

Conflicts:
	CHANGES.txt
Merge branch 'dev' into apache

Conflicts:
	CHANGES.txt
	cmake/externals.cmake