Merge "Tests for lookaside configuration" into oc-mr1-dev