[SUPPORT] LPS-38618

Hey Ray,

I'm sending this pull to you because they're modifying some code and tests that you wrote in http://issues.liferay.com/browse/LPS-28357.

My feeling is that the new code is breaking your old use case, but you will probably know better.

Thx!