master-qa-5356

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