add tomcat7 role
test deploy of fedora4
initial add of updated solr4.6 role due to replace older one
minor clean up of roles