Merge "Add encryption parameters to package installation" into jb-dev