Terminated trailing whitespaces and imports issues
refs #827