KNOX-480 KnoxCLI needs to print usage when alias not provided
KNOX-479 - Remove cacheManager configuration from template files
Merge remote branch 'origin/apache-ref/master' into dal