master-qa-4854

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