master-bc-710

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