Checkstyle updates to Search.java, SearchSpace.java.
Merge branch 'localBranchSean'