LPS-36904

Hey Brian,

I just did a code review and trusted that Daniel had tested this through. I didn't find anything wrong, just a couple of things that I wanted Daniel to double check and that I asked him in his pull (https://github.com/JorgeFerrer/liferay-portal/pull/197)