Made fixes for whitespace errors and checstyle warnings before merge.
13 files changed