master-bc-734

http://issues.liferay.com/browse/LIFERAYQA-5553

This one has another file rename where the only difference is the letter casing. The first commit deletes the files and the second commit re-adds them back in. Let me know if you run into issues.