Remove or document code duplicated between play2-java and scala
Merge pull request #1025 from richdougherty/refactor-play2-config

Fix merging errors