master-qa-7510

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