Move the ubldr status files into the ubldr build directory.
This DTRT if you just delete the ubldr build directory.
Update 'option SwapFile' to work with the revised
swap file support in FreeBSD 10.
Merge remote-tracking branch 'upstream/master'