Update to match kitchensink-spring-basic. Fix errors due to missing dependencies. Fix warning in test case due to deprecated API usage.