LPS-47389

Heya Brian, I never meant to send you the pull that had all these changes, but for some reason I mistyped the git alias I have to reject a pull.\nFor more info on why I rejected it, here's the original comment that should have been on there pull:\nhttps://issues.liferay.com/browse/LPS-47389#comment-466668\n\n/cc @ethib137 @sergiogonzalez