Merge "Added special constructors for Passpoint and OSU AccessPoints"