Fixed #21581 -- Fixed a number of issues with collectstatic.