TRUNK-4012 Improved installation script