Merge pull request #306 from praveenkv/pkv_route_code_restructure

Remove usage of Agent::singleton_ from agent_route and agent_path