master-bc-700

http://issues.liferay.com/browse/LIFERAYQA-5155