LPS-32370 Update dir
LPS-32349 Revert for now
LPS-32131
LPS-32349 boostrap.jar is too generic of a name