Macron moves to quash security aide crisis as opposition digs in