CDAP-400 Added option to provide a Supplier<AccessToken> and various cleanups

empty line to separate methods.