#7716 blog-view: get total number of comments via p.a.discussion
#7716 director-corner-view: fix to use p.a.discussion
OSHAHelpCenterView: Move all initialization that is not strictly needed from
__init__ to __call__ Attempt to fix #8417
Preparing release 1.5.39
Back to development: 1.5.40
Merge branches '7715-blog-p.a.discussion' and 'master' into 7715-blog-p.a.discussion

Conflicts:
	CHANGES.txt
Merge pull request #1 from syslabcom/7715-blog-p.a.discussion

7715 blog p.a.discussion
remove 'is_default_page' from query inside sitemap - we don't seem to have that index in solr?? Fixes #8569
update changes
Preparing release 1.5.40
Back to development: 1.5.41
Add CAPTCHA to mail passworf form. Fixes #8761
remove trailing spaces
use correct pw hint label
remove trailing spaces
Add CAPTCHA to contact_us_form. Fixes #8773
Merge branch 'master' into oshmail-revamp