master-bc-709

http://issues.liferay.com/browse/LIFERAYQA-5340

Let me know if you still get a rebase error. I just rebased this branch on top of trunk head and didn't get any errors.