*9016* Moving bagit code to avoid bug 9020.
*9016* Adding options to settings form along with option validation.