master-bc-1214

https://issues.liferay.com/browse/LIFERAYQA-7791

An additional fix was needed this. I've included the commit you asked about in the master pull request. That commit is not needed in ee-6.1.x or ee-6.1.30.