Merge pull request #277 from raghuvissu/master

configuration changes in selfcare