Added device and Connectivity monitoring object to default client
template.
Cleanup resource id's from client definitions file