master-qa-8216

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