master-qa-8068

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