Detect images/containers conflicts in docker inspect
fix indent in doc
Merge pull request #1810 from dotcloud/1798-inspect-fix

Detect images/containers conflicts in docker inspect