refs #6709. Outstanding problems.

.Firstly if there is no custom usage, the auto generated usage never gets added. Secondly, if there is a deprecated section, then the screenshot gets overwritten.
Merge remote-tracking branch 'origin/feature/6709_custom_usage'