Test Fixes (master-qa-4829)

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