adding a verification that the expected alias value was set
Merge remote branch 'origin/apache-ref/master' into baikal-GA-0.4.0