master-qa-9157

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