Removing extra whitespace in some classes.
Fixing configuration merge issues in the build class.