master-qa-5647

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