Merge "Raise security patch level to 2017-06-01" into FPIIM_WIP