master-qa-5011

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