A Christian former police community support officer in North Yorkshire has been dismissed and later reinstated after asking questions about Islam during a mandatory diversity training session.