Merge "Bug 762: Fix sal-rest-connector unit tests"