Make agent-init more consistent
Disable test code that are not compiling
Merge pull request #696 from praveenkv/master

Make agent-init more consistent