CC-4879: Pop-up HTML Audio Player still seems to be changing spaces to %20 and so on...

-fixed
Merge branch '2.3.x' of dev.sourcefabric.org:airtime into 2.3.x
locks should occur inside try/catch
Merge branch '2.3.x' of dev.sourcefabric.org:airtime into 2.3.x
Merge branch '2.3.x' into 2.3.x-saas