master-qa-10678

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