Update to tomcat.py

-Added "force" (default false) option commensurate with force option in salt.modules.tomcat.deploy_war to allow forced deployment of a .war even if the version strings match.  
-Forced successful deploy comment to be a string instead of dict to compensate for https://github.com/saltstack/salt/issues/12840
Update tomcat.py
file.directory: fix cleaning directory symlinks

With a file.directory state, using the 'clean' directive, some symlinks
could not be removed, raising exception:
  OSError: Cannot call rmtree on a symbolic link

The reason is that valid symlinks for directories are returned
by 'os.walk' as directories.

This commit checks if directories are, in fact, symlinks, and treats them
as simple files.
commiting change to ec2.py, added placement group support
Fix traceback due to unavailable module

The class defined in this state references a module that is not
installed. This commit moves the class definition with the try/except
where the deps it requires are loaded.
Document the options not allowed in the
Document the options that should not be used in the tar_options
parameter. Let the command tar to fail if the user dosn't use the right
options like --file, -a, -x, etc.

It doesn't worth the effort to put a logic to detect forbidden options
in the module.

The current code of removing 'f' breaks long options that have 'f', like
--transform.
disable confusing [ERROR] printing on retcode!=0 where not relevant
added placement group support. Fixed line spacing
Properly use try-finally for file handle management
Fix indentation of class
Don't stacktrace if we can't write a job cache.

Closes #12978
Fix crash when launching an EC2 instance.
lint fixes
Merge pull request #12988 from gtmanfred/develop

cache node correctly
Merge pull request #12987 from getlantern/develop

Fix crash when launching an EC2 instance.
Merge pull request #12970 from GeekyTex/develop

Added Ec2 Placement Group support
Revert "Truncate id hash to 10 chars"

This reverts commit a39f3f6cbf1788a59f78dde5d7836c0cefe6ad7b.
Added more information about how salt-syndic works.
Truncate id hash to 10 chars

This helps avoid the sock path being longer than the max length allowed
by the kernel. See the following comment for more information:

https://github.com/saltstack/salt/issues/12172#issuecomment-43903643