master-bc-713

http://issues.liferay.com/browse/LIFERAYQA-5340

Alright, hope this one works.

I split up the commits - one to delete the files, and one to re-add the files back in. I rebased it on top of master and didn't get any issues.