master-qa-7644

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