master
[JAVA-9604] Refactor and code clean-up for Metrics article
JAVA-3538: Move spring-rest-testing into spring-web-modules