master-qa-9545

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