master-qa-5080

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