Correcting regex in barbican invalid content_type test

Change-Id: I908c7e2744013bf082790ae700eb29ec40462968
Fixing deprecated imports in barbican

Change-Id: I6b5c04a85451224465f6109be47f58fa8e764bdd
Adding test to make sure we don't get an empty error message

Related-Bug: #1269594
Change-Id: I48d7b1aeba7027012b13333855b119d348feea21
Merge "Correcting regex in barbican invalid content_type test"
Merge "Fixing deprecated imports in barbican"
Merge "Adding test to make sure we don't get an empty error message"