Merge branch 'master' into Release_170815-EdgeX-EAP

glide.yaml

diff --git a/glide.yaml b/glide.yaml
index 3a65a73..052b5cd 100644
--- a/glide.yaml
+++ b/glide.yaml
@@ -15,8 +15,8 @@
 package: github.com/apid/apidAnalytics
 
 import:
-- package: github.com/apid/apid-core
-  version: master
+- package: github.com/30x/apid-core
+  version: Release_170815-EdgeX-EAP
 testImport:
 - package: github.com/onsi/ginkgo/ginkgo
 - package: github.com/onsi/gomega