Make sure to use the correct error message on XMLPullParser exception
fix a potential npe
new test for #997
Merge branch 'master' into issue/997-wrong-error-message-on-selfhosted-login
Merge branch 'develop' into issue/997-wrong-error-message-on-selfhosted-login
Make sure to use the correct error message on XMLPullParser exception

Conflicts:
	src/org/wordpress/android/ui/accounts/SetupBlog.java
Merge branch 'master' into develop