CLC-1050 Changes per review: fix whitespace, make current_term system codes a setting