Use spring-cloud snapshot
Ported over some of Dave's changes