Fixing issues in previous checkin - still figuring out how to make expectedFailureClang take the bugnumber

git-svn-id: https://llvm.org/svn/llvm-project/lldb/trunk@175945 91177308-0d34-0410-b5e6-96231b3b80d8