Add java_version fact
Add patch level patch
Fix java patch level fact
Add logic to not update if newer version present
Move all into upgrade block