Merge branch 'master' into Release_170815-EdgeX-EAP