master-qa-5866

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