Fixes #3512: erase error in search node form when needed
Merge pull request #225 from fanf/bug_3512/error_not_erased_in_search_nodes_form

Fixes #3512: erase error in search node form when needed
Merge branch 'branches/rudder/2.4' into branches/rudder/2.5
Merge branch 'branches/rudder/2.5' into branches/rudder/2.6

Conflicts:
	rudder-core/src/main/scala/com/normation/rudder/services/servers/NewNodeManager.scala
	rudder-web/src/main/scala/bootstrap/liftweb/AppConfig.scala
	rudder-web/src/main/scala/com/normation/rudder/web/components/SearchNodeComponent.scala
Merge branch 'branches/rudder/2.6' of github.com:Normation/rudder into branches/rudder/2.6

Conflicts:
	rudder-core/src/main/scala/com/normation/rudder/services/servers/NewNodeManager.scala
	rudder-web/src/main/scala/bootstrap/liftweb/AppConfig.scala
Merge branch 'branches/rudder/2.6'