Better error message when sibling resolution fails#1253

eric-maynard merged 3 commits intoapache:mainapache/polaris:mainfrom

eric-maynard:sibling-resolution-fixeric-maynard/polaris:sibling-resolution-fixCopy head branch name to clipboard