Merge branch 'master' into fix-gradle

Author: kevinkowa

.utility/decrypt-service-instance-apikeys.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 if [ "$TRAVIS_PULL_REQUEST" == "false" ]; then
   echo -e "Decrypt service instance apikeys for branch $TRAVIS_BRANCH.\n"
-  openssl aes-256-cbc -K $encrypted_5b4197fb87e6_key -iv $encrypted_5b4197fb87e6_iv \
+  openssl aes-256-cbc -K $encrypted_b3aab48b571a_key -iv $encrypted_b3aab48b571a_iv \
   -in config.properties.enc -out common/src/test/resources/config.properties -d
 else
   echo -e "Not Decrypt service instance apikeys for branch $TRAVIS_BRANCH.\n"

assistant/src/test/java/com/ibm/watson/assistant/v1/AssistantServiceIT.java

@@ -1770,7 +1770,7 @@ public void testDeleteUserData() {
   /** Test list mentions. */
   @Test
   public void testListMentions() {
-    String entity = "holiday";
+    String entity = "beverage";
 
     ListMentionsOptions listMentionsOptions =
         new ListMentionsOptions.Builder().workspaceId(workspaceId).entity(entity).build();