master-qa-6718

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