Format headers
Prepare globals for demo kit
Remove junit depend
More crazy ODL format compliance