Code formatting & clean-up

code formatting and clean-up within merlin-core package except Util, OozieUtil, InstanceUtil, TimeUtil and Bundle classes