Implementing #9954
Forgot to add the test.
Fixing some tests.
Changing to a more common quote character. #9896
Merge branch 'master' of https://github.com/syslabcom/osha.hwccontent

Conflicts:
	src/osha/hwccontent/browser/configure.zcml