Register servlet and other fixes, db.properties contain DEV machine details