[RAT-151] Detect more archive file formats

git-svn-id: https://svn.apache.org/repos/asf/creadur/rat/trunk@1545767 13f79535-47bb-0310-9956-ffa450edef68
[RAT-152] Recognize the format for .bsh, .fml and .jsp file types.

git-svn-id: https://svn.apache.org/repos/asf/creadur/rat/trunk@1545772 13f79535-47bb-0310-9956-ffa450edef68
[RAT-153] Do not add extra empty lines when appending headers for the Apache License.

git-svn-id: https://svn.apache.org/repos/asf/creadur/rat/trunk@1545775 13f79535-47bb-0310-9956-ffa450edef68
[RAT-154] Indentation of the license header should be decided per family.

git-svn-id: https://svn.apache.org/repos/asf/creadur/rat/trunk@1545780 13f79535-47bb-0310-9956-ffa450edef68
[RAT-135] addLicenseHeaders is missing a space on license header.

git-svn-id: https://svn.apache.org/repos/asf/creadur/rat/trunk@1545782 13f79535-47bb-0310-9956-ffa450edef68
[RAT-155] Do not add empty first and last lines in the license header for certain families.

git-svn-id: https://svn.apache.org/repos/asf/creadur/rat/trunk@1545785 13f79535-47bb-0310-9956-ffa450edef68
[RAT-156] Add some symmetry when applying license headers to files with file type specific headers.

git-svn-id: https://svn.apache.org/repos/asf/creadur/rat/trunk@1545788 13f79535-47bb-0310-9956-ffa450edef68
[RAT-155][RAT-156] Fix tests

git-svn-id: https://svn.apache.org/repos/asf/creadur/rat/trunk@1545797 13f79535-47bb-0310-9956-ffa450edef68
Merge commit '95c0c4cd7832869b190c9205e22ce57240e7a3b3' into gsoc

# By Dennis Lundberg
# Via Dennis Lundberg
* commit '95c0c4cd7832869b190c9205e22ce57240e7a3b3':
  [RAT-155][RAT-156] Fix tests
  [RAT-156] Add some symmetry when applying license headers to files with file type specific headers.
  [RAT-155] Do not add empty first and last lines in the license header for certain families.
  [RAT-135] addLicenseHeaders is missing a space on license header.
  [RAT-154] Indentation of the license header should be decided per family.
  [RAT-153] Do not add extra empty lines when appending headers for the Apache License.
  [RAT-152] Recognize the format for .bsh, .fml and .jsp file types.
  [RAT-151] Detect more archive file formats

Conflicts:
	apache-rat-core/src/main/java/org/apache/rat/annotation/AbstractLicenceAppender.java
	apache-rat-core/src/main/java/org/apache/rat/annotation/ApacheV2LicenceAppender.java
	apache-rat-core/src/main/java/org/apache/rat/document/impl/guesser/ArchiveGuesser.java
	apache-rat-core/src/test/java/org/apache/rat/annotation/TestLicenceAppender.java
Fix Test and Merge File.