Merge "Fixed bug in resolving of conditional Revision Aware XPath."