master-qa-5039

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