master-qa-7087

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