master-qa-8067

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