Don't start cifs when starting ldap

Ticket: #6258
Left some debug crap in, remove it.
Remove unused train select form
Fix.
Catch up update view with recent changes in the API

Ticket:	#6300
Merge remote-tracking branch 'origin/master' into freebsd10