[CDAP-778] Addressed PR comments. Removed commented code, other minor fixes.
Merge branch 'feature/CDAP-778-namespaced-services' of github.com:caskco/cdap into feature/CDAP-778-namespaced-services