Fixes for consul 0.4.0 and update dependencies