master-qa-8217

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