using api config option and adding cli option for image masking id
overriding generate_override_config to get mask-id from the cli add it to the override config
merging master and resolving conflict
adding a few more unit tests
adding recipe to the docker docs for uploading with mask ancestor id option
updating mask-ancestor-id option to mask-id and adding a shortcut alias
minor command description update
Adding docker upload image masking option to the importer tech reference
Merge pull request #23 from pulp/skarmark-upload-image-masking

Skarmark upload image masking