Add alias binding for orchestra.facile

Signed-off-by: crynobone <crynobone@gmail.com>
Handle attach orchestra/memory for orchestra.mail service locator.

Signed-off-by: crynobone <crynobone@gmail.com>
Small refactor.

Signed-off-by: crynobone <crynobone@gmail.com>
Swap and with && and or with ||.

Signed-off-by: crynobone <crynobone@gmail.com>
Fixed testcase.

Signed-off-by: crynobone <crynobone@gmail.com>
Merge branch '2.1'