Correct error message for invalid catalog name
Fix test
Rename hive-apache1 to hive-hadoop1
Add hive-hadoop1 plugin to server bundle