master-qa-9516

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