KNOX-258 enabled --master argument for create-master
Merge remote branch 'origin/apache-ref/master' into baikal-GA-0.4.0