master-qa-5339

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