Fixed Universe.java to abide by checkstyle, findbug and PMD rules.
Fixed Universe.java to abide by checkstyle, findbug and PMD rules.
Merge origin/master