master-bc-713

http://issues.liferay.com/browse/LIFERAYQA-5340

Hey BChan,

After squashing the commits, this message about the 3-way merge will come up every time i rebase, not only the first time. I'm not quite sure how to get rid of it. The issue is because the commit changes the name of a file from PGStagingPublishToLiveNow.path to PGStagingPublishtolivenow.path, and the letter case change seems to be messing with it.

If this is still an issue, I can send two separate pull requests one after the other and that would ensure that this error won't show up.

Applying: Test Fixes - PGStagingPublishToLiveNow - path
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Auto-merging portal-web/test/functional/com/liferay/portalweb2/enduser/wcm/staging/pgstaging/block/action/PGStagingPublishtolivenow.action
Removing portal-web/test/functional/com/liferay/portalweb2/enduser/wcm/staging/pgstaging/block/action/PGStagingPublishToLiveNow.path