master-qa-4905

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