Build related changes to build 1.3.3 flatjar correctly