master-qa-3556

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