server: mr2 upgrade for connectivity

Update the file to be compliant with the parent class and
other changes as part of mr2 upgrade.

Conflicts:

	services/java/QcConnectivityService.java

Change-Id: I97dc9b73e471e037d4810ca17bbdec0195fcb42d