rhbz965890 use params method in FileService

    Not using the params from the upload form yet as there is a
    conflict in the current API module. There is a small change
    to make after the API module conflict is complete.
remove excess whitespace
rhbz953734 - content state filter will fold new state into old one
rhbz953734 - modal navigation change and wording change
Merge branch 'master' into review-2-rhbz953734