JBTIS-255: Final update for 4.1.4.Final/ 7.0.1.GA
Merge pull request #190 from pleacu/JBTIS-255

JBTIS-255: Final update for 4.1.4.Final/ 7.0.1.GA