Arkadiy Paronyan authored Aug 24, 2018 and asynchronous rob committed Aug 31, 2018

* force delay only on votes

* set proposal timestamp forward

* Adjusted timeout formula