Fix some golint errors

Fixes golint errors in core and peer package
revert reverted change
address review comments

Change-Id: I6c5a8ade6c7be80acfabe3d4198a3489a2882904
Signed-off-by: Christopher Ferris <chrisfer@us.ibm.com>

core/peer/config.go

@@ -135,6 +135,7 @@ func GetLocalAddress() (string, error) {
 	return localAddress, localAddressError
 }
 
+// GetPeerEndpoint returns peerEndpoint from cached configuration
 func GetPeerEndpoint() (*pb.PeerEndpoint, error) {
 	if !configurationCached {
 		cacheConfiguration()
@@ -174,6 +175,7 @@ func ValidatorEnabled() bool {
 	return validatorEnabled
 }
 
+// SecurityEnabled returns the securityEnabled property from cached configuration
 func SecurityEnabled() bool {
 	if !configurationCached {
 		cacheConfiguration()

core/peer/handler.go

@@ -531,8 +531,8 @@ func (d *Handler) sendStateSnapshot(syncStateSnapshotRequest *pb.SyncStateSnapsh
 	for i := 0; snapshot.Next(); i++ {
 		delta := statemgmt.NewStateDelta()
 		k, v := snapshot.GetRawKeyValue()
-		cID, kID := statemgmt.DecodeCompositeKey(k)
-		delta.Set(cID, kID, v, nil)
+		cID, keyID := statemgmt.DecodeCompositeKey(k)
+		delta.Set(cID, keyID, v, nil)
 
 		deltaAsBytes := delta.Marshal()
 		// Encode a SyncStateSnapsot into the payload