Merge "revert netvirt jvm disable setting. minor fix for shellcheck's exception"