master-qa-5510

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