Allow for property & function isValid types. Refs #6677
Merge branch 'feature/6677_wikimaker_win_debug' into develop Refs #6677

Conflicts:
	Code/Mantid/Framework/PythonInterface/mantid/simpleapi.py