[wavesplatform/Waves] Merge v0.14 fixes into master (#1423)

@petermz pushed 1 commit.

2999dfa Fixed compilation after merge