SPARK-2582. Remove unnecessary braces and also remove Logging inheritance in BlockManagerMaster