update cookbook according to new barclamp name
Merge branch '2stage/master' of https://github.com/MirantisDellCrowbar/barclamp-inteltxt into 2stage/master

Conflicts:
	chef/cookbooks/oat/recipes/install_server.rb
	chef/cookbooks/oat/templates/default/OATClient.erb