master-qa-11216

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