Comments and cleanup continued

1. General clean up
2. Removed acquiring lock on NAT config, which will cause issues with CSR device handler.
3. Fix issue in status reporting
4. Revert rpc setup

Change-Id: Ieac6951a879b5195e9ce68c8c28ae5ac25d7959d