master-qa-7255

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