master-qa-5219

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