master-qa-4990

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