add discussion inactivation.
add warning for discussion lock when there are no activities
change warning text
Merge remote-tracking branch 'upstream/master'
updated