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

Do we need to define these defaults here, if they're already in here?
cdap-cli/src/main/resources/cdap-default.xml

Or how are these two definitions of default related?