Merge "Modify restrictions bundle per api council recommendations" into jb-mr2-dev