Fixes for old git

Change-Id: Ieed56c388540880aee3c7199b2c4bf9cb95259fd
Reviewed-on: http://gerrit.aldebaran.lan/45236
Tested-by: gerrit
Reviewed-by: dmerejkowsky <dmerejkowsky@aldebaran-robotics.com>