Merge "Additional indent-pre and template interaction tests."