Merge dasein => twc

tests passed: http://test-jenkins.grid.weather.com/view/KELNER/job/KELNER-test-api-AWS/1/