Combine NonThreaded controller into Comments controller
inline comment timestamp
Update test data
change comment relative date format
add comment permalink icon
missing semicolon
Discussion js app unthreaded support
Discussion linting
Merge remote-tracking branch 'origin/d-stylefixes' into discussion-unthreaded-fixes

Conflicts:
	static/src/stylesheets/module/_discussion.scss
Do not pass true to discussion api threading
Update tests
Use code-based discussion data files
Merge pull request #6354 from guardian/discussion-unthreaded-fixes

Discussion unthreaded fixes