tomcat RC5 + atmo clients 2.0.6

Change-Id: Ia7d6155ed6286dc07529457659a1c6e807ec58ab