#1508 Make non-checkbox collapse closable on second click

[kimdre]

To close a collapse container you need to click outside of it to remove the focus. Imho closing it should also be possible with a second click inside the container. This is at the moment only possible by using the collapse with a checkbox.

This implements this workaround/possibility as described in #1508