Bump to next BUILD-SNAPSHOT and use spring-cloud version 0.9.5

Also cleaned up a few unused imports