atm fix mk 2

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
fixed an issue with database reconnection

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
some useability tweaks to atms

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
Merge pull request #2462 from caelaislinn/master

ATM fix for real
Fix for too many changelings.
Merge pull request #2471 from CIB/master

Fix for too many changelings
Merge remote-tracking branch 'bs12/master'