master-qa-5416

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