master-qa-8218

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