Add deprecation message for using old style SID
Merge branch 'new_api' into master_new

Conflicts:
	metadata.json
Small fixes for name recognition
Fix size matching for tablespace