master-qa-7714

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