* Testnet support * Upgrade contract for 1conf * Formatting changes Change-Id: Id06481d77d770a04eb200aadb82574e23cddcd36