Fixed build issues.

Signed-off-by: Chuck Haines <chaines@codemonkeyjava.com>
Updated d2-common.

Signed-off-by: Chuck Haines <chaines@codemonkeyjava.com>