master-qa-5003

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