master-qa-6918

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